Merge "Bump odlparent 2.0.4 to 2.0.5"