Fix integration_cleanup for Vanilla 2.6

Change-Id: Id2fec11b793e4f6e9c2c162e9dc06bb71323439f