Merge "Defining glassfish dependency version"