Merge branch 'OCF138-fixes-discover-api-supported-feature-negotiation' into 'staging'

Add inversion and change order of supported features in return bracket

See merge request !118