Added concern for refreshing ssoid
Fix ssoid refreshing logic
Merge branch 'ssoid-refreshing'