Use constants for deployment annotations

Fix some places where constants weren't in use for annotation lookups.
Merge pull request #390 from ironcladlou/constant-cleanup

Merged by openshift-bot