Merge pull request #272 from AppScale/testing

Merged changes from 1.6.5 to 1.6.6
Merge pull request #302 from AppScale/testing

Release 1.6.7
added in missing mock
Merge pull request #306 from shatterednirvana/nginx-test-fix

Nginx test fix