Merge changes I52c156ed,I9fb9a924 into oc-dev

* changes:
  Add VTS tests for Wfd
  Add VTS tests for Bonjour and Upnp service