Improve startup and payload handling
Merge pull request #1321 from PX4/startup_payload

Improve startup and payload handling