spring-loaded 1.1.5

Closes #27565.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ganglia: use diff not patch