Neutron plugin thinning merge from config-devel