Merge remote-tracking branch 'origin/master' into paas

Change-Id: Ica60ad600a3103747a1da848249214abbf5aa08d
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>