Merge branch 'develop' into revert_usage_tag

scripts/nm-upgrade.sh

@@ -168,7 +168,7 @@ save_config() { (
 		save_config_item LICENSE_KEY "$LICENSE_KEY"
 		save_config_item METRICS_EXPORTER "on"
 		save_config_item PROMETHEUS "on"
-		ave_config_item SERVER_IMAGE_TAG "$LATEST-ee"
+		save_config_item SERVER_IMAGE_TAG "$LATEST-ee"
 	else
 		save_config_item METRICS_EXPORTER "off"
 		save_config_item PROMETHEUS "off"