Remove keystone patches

All patches have been upstreamed, these now break things.

Change-Id: Ibaeac86f94e7dd8a6d708a8db3900786a2be7f99
Merge "Remove keystone patches" into production