adding reboot conditional
Merge pull request #985 from edx/jarv/add-reboot-conditional

adding reboot conditional