WIP
Fixes for build/deploy.
Merge pull request #1983 from mrunalp/dev/py27

Python 2.7 v2 WIP