revert all changes
RC: Add new Rush battery

Also remove annoying "RootBox" name for each battery choice.
RC: Remove hold-back to kill - Use hardware rebinding instead
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1