Resolve symlinks in the asterisk etc directory in a better way
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Resolve symlinks in the asterisk etc directory in a better way

Conflicts:
	amp_conf/bin/retrieve_conf
Merge branch 'release/12.0' into develop

* release/12.0:
  Resolve symlinks in the asterisk etc directory in a better way

Conflicts:
	amp_conf/bin/retrieve_conf