Merge "lib/apache: Reshuffle lines"