Fixes to the proposal ajax mechanism for newer cakephp versions
Merge branch 'hotfix-2.3.6' into develop