[openstack-glance/el6] (10 commits) ...Merge branch 'master' into el6

[Mark McLoughlin]

Summary of changes:

  46b04a5... Change from LSB scripts to systemd service files. (*)
  5646ae3... Use the available man pages (*)
  b9e8b65... add BR: python-distutils-extra (#733610) (*)
  88fc07e... Fix DB path in config (*)
  f22412c... fix DB path in config add BR: intltool for distutils-extra (*)
  8dd7dfe... Update to Diablo final (*)
  043feeb... Remove old tarball from .gitignore
  69c951e... Use %{?dist} instead of %{dist}
  82163bb... Include all the fixes from master since d3 milestone
  7a0b0ea... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent