fix errors in association between contacts/contacts_groups and services
fix error with command_name variable
Merge branch 'stable' of https://github.com/makinacorpus/makina-states into stable

Conflicts:
	mc_states/modules/mc_icinga2.py
fix errors after pep8
fix type shadowing in sls files