Fixed OGC_SERVER context variables that were being overwritten by default
Merge remote-tracking branch 'upstream/master'