Merge "Consolidate py2 and py3 requirements files"