Multiple Data Dirs proposal

Change-Id: Ic5c3063da333564299093feb88b038fd276c0504
Storyboard: https://storyboard.openstack.org/#!/story/138
Merge "Multiple Data Dirs proposal"