Merge changes Ibf80a618,I0a2b90bc

* changes:
  Use IComposerClient::EX_UNSUPPORTED
  Check createComposer().isOk() in test setup