Revert "CLOUDIFY-2239 Removed -no-management-space switch, since esm alw...

...ays needs it"

This reverts commit 70330e0d2eb90a54e0983cadbcab73d74586763a.