Merge pull request #1 from AppScale/testing

sync with main branch
fixed watchfile to call lib and appmanager tests correctly
extended AppManager to also take in environment variables from the AppController, that should be set for the App Engine app to start
calling helperfunctions method to find out which environment variables to set
parsing app.yaml or appengine-web.xml files for environment variables
changed print statements to use logging, and added logging where we see exceptions
Merge pull request #389 from shatterednirvana/set-environment-variables-for-appengine-apps

Set environment variables for App Engine apps
Merge pull request #391 from shatterednirvana/add-logging-to-datastore-server

Changed print statements to use logging
AppLoadBalancer Confirmation Page
Merge remote-tracking branch 'me/testing' into testing
Merge pull request #393 from DrOctogon/testing

Fixed continue URL rebranding
changed acquire_lock to work across entity groups
changed logging level to INFO
Merge pull request #395 from shatterednirvana/add-logging-to-datastore-server

changed acquire_lock to work across entity groups
returning empty dict if entities is none
fixed how we get the appid for acquiring locks
removed undefined var txnid
Merge pull request #396 from shatterednirvana/add-logging-to-datastore-server

Fixed how we get appid for acquire lock
fixed broken unit test
Merge pull request #397 from shatterednirvana/add-logging-to-datastore-server

fixed broken unit test