Pull some upstream fixes to openbadges-validator and node-jws.