Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services into fserin/schema_updates

# Conflicts:
#	app/model/osdu_model.py
#	tests/unit/routers/ddms_v3/osdu_model_test.py