[Reviewer: Andy] Make changes to infrastructure scripts to work with acl changes to diame...

...terconf