LUN-599 -- cherry-picked commit with text plugin fix
LUN-599 --- style transfered from text plg proxy image
Merge pull request #4 from pbs/LUN-599

Merge branch 'LUN-599' into support/2.3.x