fixing flow rule service timeout and notion of identity

Change-Id: I10d0fb8a797c642ef8af65b605f86559e3206976
2 files changed