Code review comment for lp:~blake-rouse/maas/fix-1522898-1.9

lgtm! After this landing please double check that this doesn't cause the issue that Mike is talking about, because if so, then we need to fix it asap, or prevent this branch from being released.