Merge "Refactor bad local variable name in KeepaliveSalFacade"