Merge "Switch to using yangtools version of mockito-configuration"