Updates in Preparation for the Java EE 7 BOM release