Bugfix: Update available/supported implementation.

Closes bug #3032.
Update and add tests for the api changes
Merge remote-tracking branch 'ivan/bug/3032_supported-services-fix' into develop