Merge pull request #11236 from mattwire/CRM-20164_Joomla_IPN