Merge branch 'recovered-2'

Conflicts:
	releng/org.eclipse.amp.build-feature/buckminster.cspex
	releng/org.eclipse.amp.build-feature/feature.xml
	releng/org.eclipse.amp.releng/promoter.ant
	releng/org.eclipse.amp.releng/publisher.properties