Merge "Remove duplicated timeout in neutron section"