Increased selenium timeout from 15 to 30.  Removed ES specific configs from straggling config file.