Merge branch 'stable-2.15' * stable-2.15: PropertyExtractor: Add null check for event.submitter Change-Id: I32fdab3192501e964eeb0008269fca9e9383abeb