Bug#865611: non-free repositories are enabled by default

[Joonas Kylmälä <joonas.kylmala@iki.fi>]

Vincent Bernat:
> For Ubuntu, they maintain their own packaging for cloud-init, so it 
> doesn't matter.

Alright. I sent a new revision of the patch with just Debian template
changes to this bug report earlier (I forgot to put you, Vincent, on the
email's CC..) so I think everything should be now good to go. I also
agree that it would be a good idea to get this patch included in the
stable release because of the aforementioned OpenStack image problems.

Joonas