changing paths from grizzly to trunk

Some links on http://docs.openstack.org/trunk/ are pointing
to http://docs.openstack.org/grizzly/ at the moment.

Change-Id: I3e6402666a67d0a81aaf7442501f934f3d8710e0
Merge "changing paths from grizzly to trunk"