Fixing fabfile.py merge issues.
More fabfile.py fixes
Merge branch 'master'
Fixed fabric deployment merges.
Merge branch 'master'