The change to have branches running with master as 4 and branch-3 for 3.x releases is complicating our DB install and upgrade scripts. There's a JIRA to track the changes but some discussion on that JIRA of how best to proceed, starting with the comment https://issues.apache.org/jira/browse/HIVE-19323?focusedCommentId=16489833&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16489833 I'm posting this here as others may be interested in chiming in.
Alan.