Difference between openvas and openvassd from two different sources?

After the changes announced in OpenVAS = Open Vulnerability Assessment Scanner there are the following two different daemons / binaries:

openvassd for the openvas-scanner-6.0 branch and below

openvas for the master branch

If you have two binaries openvassd and openvas this means that you have installed a stable and a development branch side-by-side.