Merge "Remove DELETE_SOURCE flag from FileRepo store()/storeBatch()"