CLOUDIFY-1662 fixed compilation, refactored application resolvers