Merge "Fix netconf-connector filter construction"