Corrected status and state dictionary entries.

These were showing up either incorrectly or as duplicates in the field lists in reporting and the expression editor.

Issue #1114
https://bugzilla.redhat.com/show_bug.cgi?id=1160848
Merge pull request #1185 from dclarizio/correct_status_and_state_dictionary_entries

Corrected status and state dictionary entries.