Merge Fix for GLASSFISH-21007

Why is the version here explicitly it should be left out.