Whamcloud - gitweb
LU-119 Remove code added by a conflict resolution