Move vcl_deliver after vcl_error (more consistent)

Change-Id: I4e396c45c139983ac3d9ec39716a1bbfefb95b70
Merge "Move vcl_deliver after vcl_error (more consistent)" into production