Allow overriding superuser setup delay

 patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
 CASSANDRA-5430
Merge branch 'cassandra-1.2' into trunk