Merge branch 'batch-add-keys-timeout'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

CHANGELOG

 v2.6.4
   - Remove keys from authorized_keys in-place
+  - Increase batch_add_keys lock timeout to 300 seconds
+
 v2.6.3
   - Prevent keys with a very specific comment from accidentally being deleted.
 

lib/gitlab_keys.rb

@@ -52,7 +52,7 @@ class GitlabKeys
   end
 
   def batch_add_keys
-    lock do
+    lock(300) do # Allow 300 seconds (5 minutes) for batch_add_keys
       open(auth_file, 'a') do |file|
         stdin.each_line do |input|
           tokens = input.strip.split("\t")