fixed issue with UI of jvmOptions
Merge master
Merge branch 'master' into openstack_zones