Cleaning up cuc tags
Merge pull request #4896 from danmcp/master

Merged by openshift-bot