Removed --enable/disable options from euca_conf. Fixes EUCA-9131
Merge branch 'dev/zhill/euca-9131' into testing