Merge pull request #60 from enonic/CMS-1836

CMS-1836 Refactor VacuumHandler
CMS-1836 Refactor VacuumHandler