Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev