[release] Fix recursor option in the PowerDNS configuration file
[bosh_agent] fix failing spec
merge with upstream's latest master branch