Added support for multivalued controls

Ported from http://review.evervolv.com/#/c/6398/

Change-Id: I5375e18fd67c4a211a2d1b4e01abe66390e46f75