Merged boulder-oracle-sprint branch (r3965:5512) back into trunk. All expected tests pass for all databases.