Ignore strategy resolver.
Merge remote-tracking branch 'origin/master'

Conflicts:
	services/trapd/src/main/resources/OSGI-INF/blueprint/trapd.xml