change Location API for clarity on when config is inherited or not
(fixes bug recently introduced somehow where privateKeyFile was not respected for BYON)
Merge branch 'master' into misc
tweak timings to make thread/timing tests more robust (in response to CloudBees failure)
let's call it DB_URL instead of MYSQL_URL
Merge pull request #793 from ahgittin/misc

change Location API for clarity on when config is inherited or not