Merge branch 'switch_to_pod_id' of https://community.opengroup.org/osdu/platform/system/storage into switch_to_pod_id
