Add control-M to list of characters to strip out

Adds ^M to list of characters to strip out. Fixes LP: #1108820

Change-Id: I070fa566afaafdb932a21b198c669628c56b284b
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Fix spelling in comment

Change-Id: I659b31631f06a7bc50dac609d482fde92a6334d5
Merge "Add control-M to list of characters to strip out"
Merge "Fix spelling in comment"