Update BounceHandler to 1.25wmf7 HEAD

Change-Id: Ie6cbea9eff3d1040824b3e83d5dedd53f076874c