Merge "move shiro modules to cadi repo"