Only include non-conformity messages for non-conformity items

https://www.pivotaltracker.com/story/show/51246967