This actually got fixed on the "acceptance/master/QA-996-acl_identity" branch. I forked from that branch originally so it doesn't show the change I made afterwards in this branch.