Merge change 2790

* changes:
  get rid of utils.h in libutils