rename jee to java_ee_6
Bug 1047920 - application edit route should not be enabled
Merge pull request #4405 from jwforres/bug_1047920_application_edit_route

Merged by openshift-bot
properly substitute legacy variable to new jbosseap variable name
Merge pull request #4398 from bparees/rename_jee

Merged by openshift-bot
oo-admin-usage enhancements: Show aggregated usage data for the given timeframe.

Updated oo-admin-usage man pages
Merge pull request #4408 from bparees/jboss_legacy

Merged by openshift-bot
Merge pull request #4390 from pravisankar/dev/ravi/oo-admin-usage

Merged by openshift-bot