Merge "Cleanup and re-indent some WANObjectCache docs"