OCSADV-191: cleanup
Merge branch 'feature/OCSADV-191-B' into release/ocs-2015A.1.1.1