Update.php errors when upgrading from 2.3 to Drupal.org dev version

I received the following errors when upgrading from 6.x-2.3 to the latest dev version of Commons from Drupal.org.

warning: array_merge() [function.array-merge]: Argument #2 is not an array in .../commons-6.x-2.3/update.php on line 173.
warning: Invalid argument supplied for foreach() in .../commons-6.x-2.3/update.php on line 337.

ALTER TABLE {password_policy} ADD UNIQUE KEY name (name)
Failed:
Update #6004
ALTER TABLE {password_policy_role} ADD `name` VARCHAR(64) NOT NULL DEFAULT ''
Failed:
Update #6005
update {password_policy_role} pr, {password_policy} pp set pr.name = pp.name where pr.pid = pp.pid
Update #6006
ALTER TABLE {password_policy_role} ADD UNIQUE KEY name (rid, name)
Failed: