fixing test failure due to parameter filename change
items() instead of iteritems()
Merge branch 'master' into secure-proxy-like-github-atmos-camo