BZ-12766 show error on update
Merge branch 'Sprint73-CP' into integration

Conflicts:
	src/main/js/noesis/bootstrap/facility/directives/utilityDataStatement.html