Merge branches 'master' and 'stable' of https://github.com/hyperledge…

…r/indy-plenum into master

Signed-off-by: toktar <renata.toktar@evernym.com>
Sign-off-executed-by: toktar <renata.toktar@evernym.com>
Approved-at: h-master

plenum/test/view_change/test_client_req_during_view_change.py

@@ -69,4 +69,4 @@ def test_client_msg_discard_in_view_change_with_request(test_node):
 
 def check_nack_msg(req_key, reason, to_client):
     assert "Client request is discarded since view " \
-           "change is in progress" == reason
+"change is in progress" == reason