Consolidating multiple volume flags into a single flag.

Implements blueprint reddwarf/fix-volume-flags

Change-Id: Ifb1e6dfec753d5bc4644f27efdf3eb495ed87659
Merge "Consolidating multiple volume flags into a single flag."