Merge Fix for GLASSFISH-21007

A couple of points here, is it these specific valves that cause the problem as I can't see anything in them that will cause a problem or just the fact that there is a valve at all?

Also I was wondering if it might be better to add something to the request to track that it has already been upgraded or to setUpgrade to false after the upgrade has been called.