Change connection and handshake retry strategy to retry max 10 times over two blocks (5 times per block)

Change connection and handshake retry strategy to retry max 10 times over two blocks (5 times per block) #395