Some deployers make use of the new role without
implementing a change in the software, resulting
in the correct local facts not being deployed.
To hedge against this, we add some more conditionals
to ensure that the facts are deployed.
Change-Id: Iae79ff4f1e0fad35a7bea70da1b8fe0e9c9b5dc7