GDMS Schema v2.1 (GCP-8447, GCP-8448, GCP-8449, GCP-8450, GCP-8451, GCP-8452, GCP-8453, GCP-8454, GCP-8455, GCP-8456, GCP-8459, GCP-8469, GCP-8506)
Merge commit '42e5c5a39aa26f22eff77a2a1949df99a789ada6' into branch_gdms_v2.1
GCP-8448
GCP-8447
GCP-8447
Merge commit '2072f67e6807796efbe487c98adb3f0e4e021226' GDMS Schema v2.1