Merge "Neutron metadata agent worker count fix"