OCSADV-191: cleanup
Merge branch 'feature/OCSADV-191-B' into release/ocs-2015A.1.1.1
REL-2121: NPE in TPE offset feature unload
Merge pull request #106 from swalker2m/feature/REL-2121

REL-2121: NPE in TPE offset feature unload