Update fabfile.py
Update packman.py
CFY-516 fixed conflicts