Merge pull request #12 from willtp87/7.x.locking_timeout

7.x.locking timeout
Merge branch '7.x' of https://github.com/discoverygarden/islandora_object_lock into 7.x