Revert rpmquery/rpmverify split, ain't gonna happen this time around

Revert rpmquery/rpmverify split, ain't gonna happen this time around
- Dealing with the inevitable fallout and popt-foo needs more time
  to handle, revert to the rpm 4.6-4.8 setup where rpmquery and rpmverify
  are just symlinks to /bin/rpm, allowing especially query aliases
  to work. Releasing an intermediate version where 'rpmquery --requires'
  and the like dont work would do nothing but hurt the future intention
  of splitting these things up for real.
- This effectively reverts commit 26125015e4321765582dce0b76f83530e7604d4e