consolidate java grok patterns
Merge branch 'pr/1518'