MD-SAL Cluster Token Store get stuck reading/writing to the store

Sometimes when AAA is switch to use the MD-SAL data broker as a cluster token store, during initialization, the read/write transactions get stuck without a timeout. Need to add timeout to the transactions...