Stop granting users GRANT OPTION by default.

Fixes Bug #1180041

Change-Id: Ib2eb40bca70ac45e10560264ebfba86548cf621f
Merge "Stop granting users GRANT OPTION by default."