Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev