Fix deprecation warnings introduced with upgrade to GWT 2.6.1

Change-Id: I53a4a82deb96a1cf22436b9428c2c4b4f5dec430