books/bookvol7, bookvol8 apply Camm's patches

See Camm's diff-Naur patch in the mailing list on 17-July-2014