Annotations for validation
Merge branch 'wottop/1065369' of github.com:candlepin/candlepin into wottop/1065369