Merged changes from the import branch that were accidentally committed into the trunk.

git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@749350 13f79535-47bb-0310-9956-ffa450edef68
65 files changed