Merge branch 'master' into 'master'

install/sql/incremental/upd_dev_collection.sql

install/sql/ispconfig3.sql

interface/lib/plugins/vm_openvz_plugin.inc.php

interface/web/vm/form/openvz_template.tform.php

interface/web/vm/form/openvz_vm.tform.php

interface/web/vm/lib/lang/ar_openvz_template.lng

interface/web/vm/lib/lang/ar_openvz_vm.lng

interface/web/vm/lib/lang/bg_openvz_template.lng

interface/web/vm/lib/lang/bg_openvz_vm.lng

interface/web/vm/lib/lang/br_openvz_template.lng

interface/web/vm/lib/lang/br_openvz_vm.lng

interface/web/vm/lib/lang/cz_openvz_template.lng

interface/web/vm/lib/lang/cz_openvz_vm.lng

interface/web/vm/lib/lang/de_openvz_template.lng

interface/web/vm/lib/lang/el_openvz_template.lng

interface/web/vm/lib/lang/el_openvz_vm.lng

interface/web/vm/lib/lang/en_openvz_template.lng

interface/web/vm/lib/lang/en_openvz_vm.lng

interface/web/vm/lib/lang/es_openvz_template.lng

interface/web/vm/lib/lang/es_openvz_vm.lng