All the diffs from the FDB branches that aren't about adding FDB support specifically.
Merge branch 'master' into fdb-not-fdb

Conflicts:
	src/main/java/com/foundationdb/qp/persistitadapter/PersistitAdapter.java
	src/main/java/com/foundationdb/qp/persistitadapter/indexrow/PersistitIndexRow.java
	src/test/java/com/foundationdb/qp/operator/OperatorTestHelper.java
Accidentally lost something.
Something non-fdb that just went into fdb.
merge MMcM: All the diffs from the FDB branches that aren't about adding FDB support.

Merge pull request #883 from MMcM/akiban-server/fdb-not-fdb
https://github.com/FoundationDB/sql-layer/pull/883
merge MMcM: Something non-fdb that just went into fdb.

Merge pull request #884 from MMcM/akiban-server/fdb-not-fdb-2
https://github.com/FoundationDB/sql-layer/pull/884