Merge "Move DMaaP Storage access to RWO"