Improvements to content delivery manager

- new copylocal call
- some cleanup