findbugs

- renamed spi.Handshake* to spi.Upgrade* (we should now shadow API name and this is aligned with change proposed by Jitu)