Merge branch 'nitrik/check_neutron-server'