Added Channel Mapping for CH5,6,7,8 to Copter and HELI

Resolved conflicts from 1139
HELI have CH_ROTORSPEED instead of CH_AUX2

Tested in SITL and on APM 2.5 Quad