Fix migration of servers w/o floating IPs
Remove incorrect parameter from --dump argument
Merge remote-tracking branch 'origin/master' into cinder-resources