Merge branch 'master' into zheilbron/asterix_issue470
Conflicts:
asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java
asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryBTreeCreator.java
asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryInvertedIndexCreator.java
asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryRTreeCreator.java
asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixStorageProperties.java
asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/bootstrap/MetadataBootstrap.java
asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMBTreeLocalResourceMetadata.java
asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMInvertedIndexLocalResourceMetadata.java
asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/LSMRTreeLocalResourceMetadata.java