Combined EnhancedPublisherMock into PublisherMock

because there's no real reason someone would use PublisherMock without
needing the features of EnhancedPublisherMock, and the distinction
between them was not well-defined anyway...