Merge "hooks.txt: Clean-up whitespace and wrapping for consistency"