Reset branch to master

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