Use grain match for deployment pillars

Change-Id: I4b26e97533f46b3675badf09acd4938fa57b6d35
Merge "Use grain match for deployment pillars" into production