Comment 2 for bug 1257038

Note: this is an ease of use and robustness fix. It is not a feature fix as no new behaviors will result and the metadata in question has been present since Grizzly release.