Bug 983347 - Need different paths for displaying to the screen and sending over the wire, fix tests. rs=test-only-bustage-fix a=bustage

--HG--
extra : amend_source : 472a850342c062ed0d484ecec4fffc7f386d1bbe