Merge branch 'stable-2.12' into stable-2.13 * stable-2.12: Show more fields in ls-users command Add options to filter by active flag in ls-users command Escape double dashes in documentation Change-Id: I5f1177f6dbc0fe99ce702963eccd588fb008470a