Squashed 'src/univalue/' changes from fe805ea74f..07947ff2da