Merge changes from topic "or_return"

* changes:
  Sort exported headers of libutils
  OR_RETURN supports status_t