deal with complex encoding patters during collapsing
Merge pull request #789 from zendesk/grosser/jp-join

Bug:  Fix encoding collapsing not dealing with multiple encodings in 1 line