Incorporate motor axis remapping fixes

While investigating the C-arm problems on NIR SN2, we remapped the C motor, usually on motor axis 1 for NIR cameras, onto the spare motor axis 4. Had never actually done that, and uncovered various bugs in the remapping.

Properly incorporate the changes so that we can use the spare axis on any NIR/VIS camera in the future.