Merge v2 branch into master for Airship 2.0 release
This commit is to merge the v2 branch into the current master, so all current Airship 2 code in the v2 branch becomes the new master. The previous master (for Airship 1) has been moved to a new branch, v1.9. Change-Id: Ifa6e52ee78d79b80a51891cdcef86471e364c70echanges/43/786743/4
commit
f1b8caf977