Pulling in commit from upstream 2-4-stable

Scope option value uniqueness to type. refs #5630
By JDutil, Dec 25, 2014