CLOUDIFY-1722 Initial work on using dependency injection