CLOUDSTACK-4110: update user_ip_address.dnat_vmip field in 410to420 upgrade
CLOUDSTACK-4098: Fix the test which deploys a VM from password enabled template.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
config: Fix a typo in the configuration option

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java