[rhq] Branch 'jshaughn/avail' - 2 commits - modules/core modules/enterprise