fix for sqlline to force driver to be loaded for Mac
Parse server side error message to reconstruct server sql exception on client side.
Merge pull request #234 from tonyhuang/server-new

Parse server side error message to reconstruct server sql exception
Merge remote-tracking branch 'upstream/master' into DynamicUpsert
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert
changes to if test
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert

Conflicts:
	src/main/java/com/salesforce/phoenix/compile/FromCompiler.java

conflict solved
fixed try catch
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert
Merge remote-tracking branch 'origin/DynamicUpsert' into DynamicUpsert
Fiexd fake column family test