Merge "Add vndservicemanager to default builds." into oc-dev