[Bug 225299] Merge Review: automake15