Fixes #6017: Don't trigger de deployment check in the obvious case where it should not be deployed
Merge pull request #731 from ncharles/bug_6017/dev/don_t_deploy_always

Fixes #6017: Don't trigger de deployment check in the obvious case where...