ECPP: Bring back stage 0
AKS, remove unused variables, use prime r for v6 test (perf and simplicity)
Comment ECPP changes in Changes file