stip preceeding and trailing whitespace from machine names when adding them via mobile
Merge branch 'trailing-machine-name-whitespace'