BZ-13282:ECM wizard "Annual Maintenance Spend" cannot be deleted
Merge branch 'RC20140821' into integration

Conflicts:
	.idea/workspace.xml