AMBARI-8071. Unable to start services after 1.6.1 -> 1.7.0 upgrade. (Andrew O via mahadev)

ambari-common/src/main/python/resource_management/libraries/functions/format_jvm_option.py

@@ -28,7 +28,20 @@ from resource_management.libraries.functions import *
 
 def format_jvm_option(name, default_value):
   curr_dict = default(name, default_value)
-  if not "m" in curr_dict:
-    curr_dict = curr_dict + m
-  
-  return curr_dict
+  if isinstance(curr_dict, ( int, long )):
+    curr_dict = str(curr_dict) + "m"
+    return curr_dict
+  elif isinstance(curr_dict, str):
+    if curr_dict.strip() == "":
+      return default_value
+    elif curr_dict.strip() != "":
+      if "m" in curr_dict:
+        return curr_dict
+      else:
+        if isinstance(int(curr_dict), ( int, long )): 
+          return str(int(curr_dict)) + "m"
+        else:
+          return default_value
+  else:
+    return default_value
+