Revert to start of branch, update to master

Change-Id: Ie0ca17776f73513efc94c34a18e16a4be0caba2f
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
28 files changed