MAIN-2328 fallback when no current rollup in db
PLA-1487 code formatting
Merge pull request #3683 from Wikia/MAIN-2328-r226

Main 2328 r226