Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'daley', remote-tracking branch 'origin'
Update LockedConfigurationUpdaterTest to not have race condition
Merge branch 'master' of github.com:rackspace/repose into daley