Merge "Add support for greylist-max-r signatures." am: dbf501e0eb

Change-Id: I40f0770041db4fae0e560a335f58ff2042b35299