[PATCH 16/21] Modified template_OVAL_package_installed and template_package_removed