[1575] Correctly parse Content-Type value
Just some tiny javadocs optimizations
Merge remote-tracking branch upstream/$:{upbranch}