Merge "Maven release version 2.5.1 for G maintenance" into g-release