Merge "Bug 7793: shiro.ini needs to die"