Merge "Revert "[COMMON] Changed mongo storage location to enable persistance""