Merge branch 'stable'

* stable:
  ps: Fix implementation to alias to gerrit show-queue

Change-Id: I7ccb2d747e06f6fe4e1e46b07d209ad52db426d7