Add reboot optional parameter to setup_without_openstack -- Backport from master

Change-Id: I5aca69914f07cf08f16ab2c9199beb3428fb042b
Merge "Add reboot optional parameter to setup_without_openstack -- Backport from master" into R2.0