Merge "BUG 3066 : Optimistic lock failed, on NetconfStateUpdate"