Merge "Minor formatting and consistency changes to txtdump.c" into release-4-6