Merge "Fix Robot vm_properties.py params" into release-1.1.0