Added blank selection for non-conformity sample type and made it require...

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