Added EncapsulatedOptions::merge() and accompanying test#5

Closed

Bilge wants to merge 3 commits intomasterfrom

Commits on Oct 15, 2016

Added EncapsulatedOptions::merge() and accompanying test.
Bilge
committed
Changed EncapsulatedOptions::mergeOptions to have simplified interface.
Bilge
committed

Commits on Oct 16, 2016

Changed EncapsulatedOptions::merge() to exclude default values.
Bilge
committed