LPS-40562 - Improve usage of StringBundler

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-40562.

Please let me know if you have any questions.  Thanks!