Store volume metadata as key/value pairs.

Remove the unnecessary list of elements named "key" and "value"

Fixes Bug #1197021

Change-Id: I2667f3e3a563bd72230c82f4fd42b8808904444d
Merge "Store volume metadata as key/value pairs."