Internal cleanup for aggregateMessages#3231

ankurdave wants to merge 1 commit intoapache:masterapache/spark:masterfrom

ankurdave:aggregateMessages-followupankurdave/spark:aggregateMessages-followupCopy head branch name to clipboard