Fixing the setup and teardown of SNT in mons and osds module

The puppet_apply code in setup and teardown was not successfully
removing the node_terminus = scenario configuration. This was leaving
the puppet config in an unusable state after those tests.

Change-Id: If81cc4f8516e0d70a79676e53e6fd38361d8ce71