CDB-1009 regexp to detect content type was missing the scenario of no spaces between ; and filename. Added
Merge branch 'CDB-1009' into hotfix-20140311