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

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