Merge "Adding new Tosca and deployment config files"