Merge branch 'tp/S1053805' into ibm_next_tmp
resub_all_nlm_blocked mistakenly removed the state
when lock request is successful.

Signed-off-by: Rong Zeng <rongzeng@us.ibm.com>
Merge branch 'tp/S1053805' into ibm_next_tmp
Merge branch 'tp/S1053889' into ibm_next_tmp