Add option to limit the number of reindexed options for the maintenance view.
Merge branch 'limit-option-for-reindex'

Conflicts:
	CHANGES.txt
Remove duplicated changelog entry.