Gemfile.lock update to be compatibile with newest EM
Merge remote-tracking branch 'origin/master' into load_balancer_registration