Take cluster set up out of a state and instead put it in the property.
Re-enable AAE.
Remove un-used clean up function.
Removed commented function.
Merge pull request #644 from basho/bugfix/jra/listkeys_eqc_setup

Fix occasional setup errors in verify_listkeys_eqcfsm