More file differences in newest bitcoin master

Signed-off-by: Andrew Miller <amiller@dappervision.com>