Bug 18052 - fix setting the rescan time in the classic UI
Merge branch 'public/7.7' into public/7.8