Update sip note format, small tweaks to output, service.info
Make SIP note, service and print output more similar
Merge #3713, @hmoore-r7's SIP cleanup of my SIP cleanup