Issue 16: userContextBuilder not settable in EndpointValidationPhase
Issue 13: Fix history phase mapping
Cleanup