merging kparal/rpmguard-integration into master