ENG-4291 Whitespace & comments re: r=jhugg
Merge branch 'master' into ENG-3752-cast

Conflicts:
	src/hsqldb19b3/org/hsqldb_voltpatches/Expression.java