Revert "Revert "Merge hierarchy store into Tachyon [TACHYON-33 sub-task ...

...5 & 6]""