HIVE-6045: Beeline hivevars is broken for more than one hivevar (Szehon via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1552859 13f79535-47bb-0310-9956-ffa450edef68