Merge changes from topic "resolver-timeout"

* changes:
  Add simple test for libc resolver retries
  Make resolver timeout configurable via setResolverConfiguration()