Merge "Remove vndservice_manager object classes." into oc-dev