SERVER-14668 Move locking related files to be under mongo/db/concurrency

Also performs some cleanup of the includes around locking.
Merge remote-tracking branch 'upstream/master'