UC-1596:  Unified Proxy Plugin implementation
UC-1596:  Improvements to OsPlugin.