manifest cleanup
Merge branch 'origin/jbl-4.3'

Conflicts:
	default.xml