improve deploy failure messages
Merge branch 'master' into hs_staging

Conflicts:
	SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java
firx formatting