Add Zend\Crypt\Password\PasswordAware[Interface|Trait]
Add Zend\Mail\Transport\TransportAware[Interface|Trait]

In my projects I use this quite a bit. Thought I would contribute it back to the source.