Autostart cleanup

This pull request cleans up the autostart IDs, but should allow existing setups to continue to operate as they are. This is completely untested. Comes with a QGC change: https://github.com/mavlink/qgroundcontrol/pull/451