Feature #1791: Fix Java oca
Feature #1772: Change the one.vm.resize method to accept a template, instead of individual parameters
Merge remote-tracking branch 'origin' into feature-1664