Merge pull request #412 from jhanders34/branch1

Remove SecurityManager related code from API