XLCLOUD-2082 Fixed issues with recognizing the media type, and some content not being masked.
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/xlcloud-ci