HTTPCLIENT-1466: FileBodyPart#generateContentType() ignores custom ContentType values

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.3.x@1570523 13f79535-47bb-0310-9956-ffa450edef68