Merge "Fix NetconfKeystoreAdapter onDataTreeChanged method"