AMBARI-1432. RESTART STORM/NIMBUS fails during EU, 2.1 --> 2.3 (dlysnichenko)

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py

@@ -94,9 +94,11 @@ def storm(name=None):
         content=Template("storm-metrics2.properties.j2")
     )
 
-    # Remove symlink. It can be there, if you doing upgrade from HDP < 2.2 to HDP >= 2.2
+    # Remove symlinks. They can be there, if you doing upgrade from HDP < 2.2 to HDP >= 2.2
     Link(format("{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
          action="delete")
+    # On old HDP 2.1 versions, this symlink may also exist and break EU to newer versions
+    Link("/usr/lib/storm/lib/ambari-metrics-storm-sink.jar", action="delete")
 
     Execute(format("{sudo} ln -s {metric_collector_sink_jar} {storm_lib_dir}/ambari-metrics-storm-sink.jar"),
             not_if=format("ls {storm_lib_dir}/ambari-metrics-storm-sink.jar"),