Make boot demo menu selection agree with values for boot_demo. Close #…

…824 (#825)