KDP: Remove work-arounds for SCP eol bug
Remove spaces before EOL

Also, move misplaced EOL in U/QBUS address conflict reporting.
Merge branch 'master' into KDP