Brought usnic_direct update-to-date

Merge in a couple of bugfixes from Cisco internal usnic_direct repository.