Merge "Update ConfigParser imports for python3"