Merge pull request #8308 from KevinGrandon/bug_845045_sanitize_number

Bug 845045 - Remove whitespace from phone number display r=etienne(cherry picked from commit e47143b2024ea803fede35b9b1b33a77166bb483)
Merge pull request #8344 from lightsofapollo/update-test-agent

Bug 845679 - Update test-agent to improve apps//test/unit/setup.js.(cherry picked from commit 1ad96e69b7c8ae33cbb8ba22d7cc6bb5fc58f62f)

Conflicts:

	tools/test-agent/package.json
(cherry picked from commit f3c1233b6f1278ad3b539e2f24c7f18c5478e712)