deactivating salt grain-ensure in global role

because it causes problems for new installs

commented for now, deactivating the feature introduced in
Ie8a53c7f478401b53444e8f187243f9c41603054

which added a salt grain with the puppet role name

as reported by Faidon this breaks on new servers installs

it has a dependency on a minion config and a signed salt
key already being there or the grain-ensure blocks forever

< paravoid> it's not just a dependency on the minion config,
it also hangs if you haven't signed the salt key on the master

< paravoid> I think the best would be for grain-ensure to try once,
then just fail

Change-Id: Iaede927aa4abfb680bb7b7ef78b8f138925dfe19
Merge "deactivating salt grain-ensure in global role" into production