Proper typehints in ServiceLocatorAwareTrait

The typehints are wrong. Either import the ServiceLocator class, or, what's the right thing, declare the types as what they are: ServiceLocatorInterface.