Merge "Migrate restconf to mockito ArgumentMatchers"