MDL-32191 navigation: Add keys to module and block settings nav nodes

Conflicts:
	lib/navigationlib.php