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

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