relay_acl: bug fix and regression test
Merge branch 'relay_acl' into tests