Set key location to a http file instead of key server
Merge branch 'master' into testing/beaker