Remova the nova cherry-pick

It has merged and the cherry-pick no fails (causing CI to fail).

Also ignore errors from the other cherry-pick so it doesn't call
failures if it fails.

Change-Id: Ic51d4995a68af17caeacbf1668db1bcf752d0f46