Add comments to metadata commands, add help_contents.xml
ADMIN: revert change committed in error
Merge remote-tracking branch 'origin/8.36'