moving reboot_and_wait to core
Merge branch 'master' of https://github.com/virtualop/service_descriptors