FIX VirtualPageTest memory errors due to Config API quirks
Fixed Config usage in ErrorPage
Merge remote-tracking branch 'origin/3.1'