Dns fail disable when inactive fix v3

Old one is #131 

This patchset contain one more patch that will fix dns/retry_disable_when_inactive test (I didn't noticed that because of too many topic branches).