=htp #15920 fix test-case broken because of merge conflict
Merge pull request #16208 from spray/w/15920-DebuggingDirectives

=htp #15920 fix test-case broken because of merge conflict