Completely reset branch to align with r4863
Applied several small fixes around null column index, and quiet cancellation (#480)
https://code.google.com/p/h2database/issues/detail?id=480