Fix template ppa

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Merge remote-tracking branch 'origin' into feature-exist-maas