Fix sprintf(3) formats - change some %d to %u
Rename 'id revoke' to 'id relinquish' to match documentation
build when not in git repostory.
Fix empty if test typo
Clean up after merge with upstream.