Raise VolumeNotFound with correct volume_id

Make sure VolumeNotFound is raised with the correct volume_id
in the SolidFire driver. Some exceptions were wrongfully referring
to an undefined variable named uuid.

Fixes: bug #1182966
Change-Id: Ied101fc9778f51dfb74b39f466c2c13d6e775a40
Bump stable/grizzly next version to 2013.1.5

Change-Id: Idb7cf867801b3ea79b42c0376d5cb712a5f1e2cf
Merge "Raise VolumeNotFound with correct volume_id" into stable/grizzly
Clear correct device when deleting a ThinLVM snap

The LVM driver tries to wipe a device using dd when
a snapshot is deleted.  For ThinLVM, it is attempting
to wipe the /dev/mapper/cinder--volumes-<vol>-cow device,
which does not exist for ThinLVM.  This causes snapshot
deletion to fail for ThinLVM if volume clearing is on.

When using ThinLVM, only wipe the LV device rather than
attempting to wipe the -cow device.

This bug is only present in stable/grizzly (2013.1.4).
It does not exist in stable/havana or master due to these
changes:
f702fe7 Fix secure delete for thick LVM snapshots
de43923 Don't zero out thin provisioned LV's on delete

Closes-Bug: #1245529
Change-Id: I1d8dd618e51cc99b8947fbe0697a1c765c8251ba
Don't zero out thin provisioned LV's on delete

Thin provisioned LV's don't need secure delete to protect
from data leakage.  Also, zeroing these out kinda defeats
the purpose of using thing provisioning.

This patch add a check for the lvm type and if it's thin simply
returns from the lvm.clear_volume() method.

Conflicts:
	cinder/tests/test_volume.py
	cinder/volume/drivers/lvm.py

Change-Id: Ie6764209018152565295291efc6fbba553698ae6
Closes-Bug: #1240299
(cherry picked from commit de4392314f9b0def8fab65679ec5668aec98fbee)
Pin Sphinx to <1.2

1.2 was just released and has a bug that causes builds to fail with
the error:

  error: 'source_dir' must be a directory name (got `...doc/source`)

See: http://bugs.python.org/issue19570
and: https://bitbucket.org/birkenfeld/sphinx/pull-request/193/builddoc-shouldnt-fail-on-unicode-paths/diff

Change-Id: I0487b4eca8f2755b882689289e3cdf429729b1fb