Make pylint happy
Sync with lp:cloud-init