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: I1e783c5a791ab66fbb693f672d87cbf092cf8112