CLOUDIFY-1660 integrated DeploymentsController with the deployment factory and reverted serviceController changes