Merge "Convert TOSCA loader from a Deployment to a Job"