lp:~maas-maintainers/maas/1.6 is now a thing, and the 1.6 series is linked with it. Feel free to hack on trunk with impunity, but if you need to backport anything to 1.6, talk to the release manager first (that's me!). Cheers.