Dont run genconf over and over and etc
Merge branch 'develop' into release/2.11

Conflicts:
	includes/dahdi_cards.class.php
FREEPBX-7051 FREEPBX-7381 plus bug fixes