addressed review comments
Merge branch 'API-1525_HTTP_OVERRIDE' into nanoc