Add support for Map @Option fields

Change-Id: I61fd7984e4a172d7eec8715c4979fae539a41559
10 files changed