Merge "Merge branch 'security-basecamp' into master"
authorJon A. Cruz <jonc@osg.samsung.com>
Fri, 21 Aug 2015 22:16:33 +0000 (22:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 21 Aug 2015 22:16:33 +0000 (22:16 +0000)

Trivial merge