CRAFTERCMS-916
Fixed bug in rename process caused by changing content-as-folder and fixed bug in deployment engine that is sending folder path for delete even though it still has children.
Merge pull request #296 from dejan-brkic/2.3.x

CRAFTERCMS-916