Merge branch 'stable-2.6'

* stable-2.6:
  Clearer error message when Change-Id line not found
  Fix parameter checking on ls-projects command
  Add LDAP Groups section to docs

Change-Id: I38b1979a72d7327bfb41cc0a676123c4a238c330