Cleanup deployment controllers, use filter manager to select new HRs.
Pre-merge commit
Merge branch 'master' of git://github.com/nursix/eden