Merge "Unit tests for NeutronSubnetAware"