Calif. community choice agencies add more big battery, solar deals