Now, both the unit and functional tests relating to derivation options are tested both ways -- with input addressing and content-addressing derivations. (cherry picked from commit 307dbe9914)
307dbe9914
