Support for OpenStack OS-Services API

The upper wildcard is no longer necessary: `Optional<ServicesApi>`