Simplify expression and make PMD happy
Recording .gitmergeinfo Changes
Adjust Message property updates for 2.7.x branch