Add tenant support to OS mgmt_system

Add tenant support to OS mgmt_system