Merge pull request #3601 from mkurz/httpHeaderFixes

Added more Http Headers & fixed ETag header
add Json#parse(input: InputStream)
Merge pull request #3600 from xuwei-k/Json-parse-from-InputStream

add Json#parse(input: InputStream)
Swap first AkkaHttpServerSpec test and increase timeout

The first test in AkkaHttpServerSpec has been failing in master. The
purpose of this change is to investigate why. Is it only the first
test that fails? Is the failure something to do with the slow CI test
box? Once we've worked out the solution, we should be able to revert
this change.
Improves handling of forwarded headers. Fix #2094