Merge "Removed 'mock' from TOSCA deployment"