Fix two minor warnings#475

OddBloke merged 3 commits into

canonical:mastercanonical/cloud-init:masterfrom

OddBloke:warningsOddBloke/cloud-init:warningsCopy head branch name to clipboard