Merge branch 'tp/S1046468' into ibm_next_tmp
Grace period should be >= Lease_lifetime.
For environments which have issues with grace period more than 60 seonds,
Lease_Lifetime in main.conf can be changed to a smaller value.

Signed-off-by: Srikrishan Malik <srimalik@in.ibm.com>
Merge branch 'tp/S1046468' into ibm_next_tmp
Merge branch 'tp/ibm_next_S1046450' into ibm_next_tmp
Merge branch 'tp/ibm_next_S1046447' into ibm_next_tmp