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

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