Jrbl/broken log rotation release

For @jbau, into edx-west's release branch (which hasn't yet been updated with recent master, or even recent release)