Readd fix from master dealing with fy.re environment (livefyre local dev...

...)