Make sure we always save the raw catalog to the puppet db