CLOUDIFY-2183 Added the shutdown-managers command in the new REST API.
CLOUDIFY-2153 Look for additional templates files under the persistency folder if exist.
CLOUDIFY-2153 Changed the location of additionalTempaltes folder to be under the persistent folder if it exists.
CLOUDIFY-2153 conflict resolution.