Incorporate fix for GLASSFISH-21138

This fixes the bug that prevents editing of availability settings in the console