fix configure order calculation - bz1008609
Handle categories not used
Merge pull request #3652 from danmcp/stage

Merged by openshift-bot