Security JavaConfig fixes
Merge pull request #1 from rwinch/mirror

Security JavaConfig fixes