[checkmk-commits] Remove more pnp templates and fix some issues