Merge "Simplify maven site configuration"