Update patches under nova and keystone wrt grizzly

Original files have been modified in grizzly
as compared to folsom.

Change-Id: I81db8898b0988cf2723b8c49d76811113890c932