release: version 2.1.0 -> 2.1.1
ZEN-11959. Only remove if BOM marker is present
Merge branch 'release/2.1.1_ucsx' into develop

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/datasources/PerfmonDataSource.py
	setup.py