Merge "Remove unnecessary Bundle-Activator from ECF tests"