Merge "Python 3 Fixes: use six.moves.configparser"