Merge pull request #208 from drzhonghao/master

[SHIRO-751] SimplePrincipalMap and SimplePrincipalCollection throw different exceptions for the same problem