Issue #2282931 by sylus: Fixed Incorrect roles are sometimes saved by UUID services via deploy.
Issue #2321597 by sylus: Fixed Deployment screen occasionally doesn't work.
Merge branch '7.x-1.x' into 7.x-2.x

Conflicts:
	wetkit_deployment_source/wetkit_deployment_source.module