Ernie- I'm far from being the Firepump Guru on this Board but there aren't any exceptions that I read so my answer is yes both supplies must comp[y with 695.6(B) 1 or 2 or 3.
Hey ask easier questions like "What color is a green ground screw?"
See Ya in TC
