MFstable/10 r293003:

MFC r292640,r292641:

r292640:

Clean up trailing whitespace; no functional change

r292641:

Fix r292640

vim overzealously removed some trailing `+' and I didn't check the
diff

Pointyhat to: ngie