Merge pull request #1919 from rperryman/pull-req-master-338c9ec34926a76e4ca8e179a3204c9fdf4129a0

Update nvoa-fixed and os_sdn [1/1]
No need for the sleep waiting for Puma to come back anymore.
Add --wizard flag to use the admin node wizard.
Have install pass all args to the real install script.
more posgresql tweaks for dev - this makes sure to create the database if it is missing
more tuning for test infrastructure
Merge pull request #1920 from cloudedge/master

https://github.com/crowbar/crowbar/pull/1920

Merged by devtool for VictorLowther