Merge change 21737 into eclair

* changes:
  Added -s flag to ls.