fix #3015 - drag and drop respects CMS_PLACEHOLDER_CONF
Merge branch 'bug-3015' into HEAD