Merge branch 'sh-fix-geo-port-spec' into 'master'

Fix Geo specs failing due to "lock out" validation errors

Closes #4303

See merge request gitlab-org/gitlab-ee!3726

spec/factories/geo_nodes.rb

 FactoryGirl.define do
   factory :geo_node do
-    sequence(:url) do |port|
+    # Start at a number higher than the current port to avoid the GeoNode
+    # "lock out" validation
+    sequence(:url, Gitlab.config.gitlab.port + 1) do |port|
       uri = URI.parse("http://#{Gitlab.config.gitlab.host}:#{Gitlab.config.gitlab.relative_url_root}")
       uri.port = port
       uri.path += '/' unless uri.path.end_with?('/')