Merge branch 'commontocken' into mthive-0.11-dev
 DATA-4242
Merge branch 'mthive-0.11-dev' of github.com:MTDATA/hive into mthive-0.11-dev
 DATA-4242
Merge branch 'mthive-0.11-dev' into mthive-0.11