Merge "BUG-509: cleanup StoreMetadataNode"