Sync master branch with rel-1.2-maint for 1.2.0 Release and 1.10.0 VIVO/Vitro release
Created by: roflinn
Sync master branch with rel-1.2-maint for 1.2.0 Release and 1.10.0 VIVO/Vitro release
Created by: roflinn
Sync master branch with rel-1.2-maint for 1.2.0 Release and 1.10.0 VIVO/Vitro release