Fixing fabfile.py merge issues.