Merge "Add option to list vndservicemanager services." into oc-dev