Merge "Add support for enabling L2 population in Neutron"