Better fix for ERRAI-586: omitting content-type when unknown
Merge branch '2.4'