1009560 - fix deletion of environments without puppet content