Fix PhoenixTestDriver so it can used from SQuirrel, fix various salting issues
XMerge branch 'master' into saltbug

Conflicts:
	src/main/java/com/salesforce/phoenix/compile/UpsertCompiler.java
	src/main/java/com/salesforce/phoenix/schema/SaltingUtil.java