Merge "Move maven repo override"