Fixed model for using in both Joomlas
HOTFIX for support helper
Merge branch 'dev/j2/common' into dev/j2/free