add new states for maas 1.7, and add tests to ensure that we do the right mapping that the rest of the code will expect.
update comment
fix pep8 indentation issue
Merge with master
Merge pull request #287 from Ubuntu-Solutions-Engineering/expand-maas-states-1395123

add new states for maas 1.7, and add tests to check mapping