Consider ulimit -v when automatically determining the Java max heap
Merge branch '4.3'