Branch b1_6

b=13693
i=adilger
i=green

do not forget to cancel locally locks with invalid import;
do not cancel locks in ldlm_lock_list_put() when 0 locks are to be canceled;