CRM-14208 additional includes for J3.2.1+
CRM-14208 move joomlaBase outside of condition clause
Merge pull request #2833 from lcdservices/CRM-14208b

CRM-14208 additional includes for J3.2.1+