SHIRO-164 - Integrated recent changes from trunk into the branch - prepping for merge back in to trunk git-svn-id: https://svn.apache.org/repos/asf/incubator/shiro/branches/session_manager_API_change@945995 13f79535-47bb-0310-9956-ffa450edef68