Revert "Refs #3747 - Remove if statement about CFEngine nova"

This reverts commit bbfb303d773d71361e9efa9a7704d26cc07cd967.
Revert "Fixes #3747 - Fix initialization of variables"

This reverts commit e789ca02b2fd555cd9ce96e0cbcbe0abcb820a3f.