Also switch to using the forward plugin for upstream servers. Change-Id: I91d89fc28384e47444c0c35683a0accf81a4695d