Fix monit filename and warden head patch no longer needed.

Change-Id: Ia3d14cc58a99b57fd448582b2fb27b417f6de556