Fixes #1242
Fixes #1182 - RxBatt removed
Fixes #1241 - Revert "Bootloader now accessible with left OR right trim inwards"

This reverts commit 54447a45a0671600a70adf2cc24de29a1f447a49.