Merge "Add netconf test to verify key ordering in output"