Fix errors introduced by a previous refactor on the controller of application deployment
Refactor some code on admin_cloud_image tests
Merge branch 'develop' into develop-a4c