salt::grain: fix 'contains' check

`grain-ensure contains` returns an empty list when the grain is set to a single
value; it should return a list containing the value instead.

Patch also contains whitespace fix for trebuchet.rb

Change-Id: I9e44d0c8612d20ea2af1c5c62ad6807e5b7abd2b