Redmine #5506: Fix package version containing package name in report.

Not touching 3.5, since it has many other problems with updates
anyway.
(cherry picked from commit 3ba537d0a36113dde87ee5ca5c0ecb03aaebb221)

Conflicts:

	lib/3.7/packages.cf
Merge pull request #216 from kacfengine/version_is_not_name_3.6

[3.6.x] Redmine #5506: Fix package version containing package name in report.