WFLY-3385 Handle query parameter encoding when doing forwards and includes