Merge "Bug 4912 - NeutronL3Adapter: missing/reordered enabled check"