Merge pull request #177 from dminor/bug-1046266-fix

Fix handling of timeout for permissions tests.