Merge "Add alias for mockito-core naming scheme"