[PATCH 2/3 rhel7-branch] A couple updates to installclasses.