Bug 1070047 - Upgrade chaijs to a newer version (rebased)