=htc small fix and improvements to HttpEntity
!htc #15674 refactor, improve Multipart model
!htp #15674 upgrade to new Multipart model