Merge branch 'master' into columnfamilies

Conflicts:
	db/db_impl.cc
	db/db_test.cc
	include/rocksdb/db.h

include/utilities/stackable_db.h

@@ -182,6 +182,10 @@ class StackableDB : public DB {
     return db_->GetDbIdentity(identity);
   }
 
+  virtual Status GetPropertiesOfAllTables(TablePropertiesCollection* props) {
+    return db_->GetPropertiesOfAllTables(props);
+  }
+
   virtual Status GetUpdatesSince(SequenceNumber seq_number,
                                  unique_ptr<TransactionLogIterator>* iter)
     override {