Merge changes I33eb4618,Ifbb7139e

* changes:
  use getIfName in more spots to improve logging
  replace U32 ifindex with S32