Merge branch 'jmarantz-config-with-response-headers-test' of github.com:pagespeed/ngx_pagespeed into jmarantz-config-with-response-headers-test