rename jee to java_ee_6
properly substitute legacy variable to new jbosseap variable name
Merge pull request #4398 from bparees/rename_jee

Merged by openshift-bot
Merge pull request #4408 from bparees/jboss_legacy

Merged by openshift-bot