Merge pull request #182 from ssOleg/develop

Fixed ZEN-11583 issue
Merge pull request #183 from ssOleg/develop

Fixed ZEN-11591 issue
ZEN-11959. Only remove if BOM marker is present
Merge pull request #184 from zenoss/feature/ZEN-11959

ZEN-11959. Only remove if BOM marker is present
Fixed ZEN-11828 issue
Merge remote branch 'upstream/develop' into develop