LF-14029 - Merge with Livefyre.js changes