Fix bad merge commit

Unmerged sections of test_thumbnailPerms.py made it in. 

/cc @ximenesuk