Merge "Refactored ExtendedMockitoTestCase into ExtendedMockitoRule" into udc-dev