uniforms skip messages

this is an attempt to uniform skip messages and ensure multi-line
skips are correctly accounted by https://review.openstack.org/#/c/42424/
I think a future update to hacking/checks.py is also needed

Change-Id: I8ef1ac22a8b137f397847d217467df5572afde43
Merge "uniforms skip messages"