Merge "Get ppa:maas/next, add eth1 on controller, other minor edits"