Revert back to Java EE 6 compatibility for PRD deployment