CRM-12499 static warning fix

Conflicts:
	packages