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