release: version 2.1.0 -> 2.1.1
ZEN-11959. Only remove if BOM marker is present
Merge pull request #244 from ssirushchyshyn/develop

ZEN-10924
Merge branch 'release/2.1.1_ucsx' into develop

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/datasources/PerfmonDataSource.py
	setup.py
Fix bad merge from release/2.1.1_ucsx.

Resolve one unresolved merge in PerfmonDataSource.py.
Document 2.1.3 changes.
Fixes ZEN-9726.  Adds support for payload encryption
Merge pull request #245 from zenoss/feature/ZEN-9726

Fixes ZEN-9726.  Adds support for payload encryption
Fix for ZEn-15044
fixes ZEN-11030
Merge pull request #247 from zenoss/feature/ZEN-11030

fixes ZEN-11030
Merge pull request #246 from ssvsergeyev/develop

Fix for ZEn-15044
Updates ZEN-9726
Merge pull request #248 from zenoss/feature/ZEN-9726

Updates ZEN-9726
Bump revision to 2.2
Fixes ZEN-11511
Merge pull request #249 from zenoss/feature/ZEN-11511

Fixes ZEN-11511
ZEN-14514, ZEN-14515
Merge pull request #250 from zenoss/feature/ZEN-14514

ZEN-14514, ZEN-14515
Analytics: added labels to all components