Merge branch 'master' into bizo-2.10

* master:
  Work around a possible AWS bug in batchGetItem() that is returning "HashKeyElement" as the key item name in the unprocessedKeys property.
Merge remote-tracking branch 'upstream/bizo-2.10' into bizo-2.10
Sync branches

* upstream/bizo-2.10: