Fix for 1391667: Retry cassandra ops 5 times (also the default value)

Change-Id: Iea8e464ebdc78b01356b817af5379ad4f2deed8f
Merge "Fix for 1391667: Retry cassandra ops 5 times (also the default value)"