Make it possible to switch between Waypoints with ch7/ch8 opt.

This change will make it possible to switch between different Waypoints
with Ch7/Ch8 Opt, this is particularly useful if you define
"Loiter Unlimited" Waypoints and want to switch between them.

Signed-off-by: Simon Egli <simon.egli@tik.ee.ethz.ch>