Merge remote-tracking branch 'origin/master' into 424059

Conflicts:
	framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
	osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
	providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF

merged manually by sbl

Change-Id: If086dde4fffb137f44a48d183f6280f068c8eb17