Allow grains to be set with a single value

Some grains should be set explicitly with a single value, rather
than a hash/array of values.

Change-Id: I9e24551c26bf659059d29c2b0eee2f7636a0dd92
Merge "Allow grains to be set with a single value" into production