Revert "Use aegir_custom_settings-6.x-3.5"

This reverts commit 906e70d9afbc69aec4fad10550fbd0c148dbb4f2.