Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74