menu xml : remove trailing spaces and fix spacing to sync with 4.4

fix whitespace

fix xml

Conflicts:
	packages