Mostly ES related bug fixes in awscluster scripts and in REST test infrastructure.