Merge "Updated modules.conf and modules-shards.conf to updated the util.py to remove...