Erroneous column labeling on Control import #62666278

Per [story 62666278](https://www.pivotaltracker.com/story/show/62666278).  Lingering bug: import interface was not correctly recognizing the Principle/Secondary Assessor and Status fields and so was claiming that they were missing, and that it didn't know what to do with those columns.  Fixed by updating the CSV and HAML templates so it has the correct expectations.