NSH term: Only time out if no arming information is available, if arming information is available abort if unconnected on arming
Merge pull request #1419 from PX4/nshterm

NSH term: Only time out if no arming information is available, if arming...
Merge pull request #1 from PX4/master

sync with upstream