Bug #2388: Fix typo in EC2 VMM driver
Bug #2045: wrap around the vnc port number

(cherry picked from commit 005aa35739ac1b2ebe8646fc21283e75b8b5f785)
feature #1558 & #1563: Add default value for model (NIC=[model]) and for raw attributes as (RAW="raw value"), for KVM, Xen and VMware

(cherry picked from commit 678bb84940fbbcebc86aa91fb1465cf5d361093d)

Conflicts:
	src/vmm/LibVirtDriverVMware.cc
Bug #1688: Openvswitch brcompat deprecation issues

(cherry picked from commit 808dcaed4825a605c0be5d29831e0d37897f8722)