Bug 972977 - Fails on all numeric usernames.  Improve performance by eliminating call to oo-get-mcs-level where possible.
Bug 972977 - /var/tmp is also polyinstantiated and restorecon was giving errors about the old directory.
Merge pull request #2818 from rmillner/misc_bugs

Merged by openshift-bot