Conform with the dict return type for 'salt.modules.grains.item'.
One more `grain.item` fix to comply with new dict output.
Fix supervisor test.
Merge pull request #3413 from s0undt3ch/develop

Fix tests.