* Adding ValueProviderFactoryProvider and CompositeValueProviderFactory to maintain parity in pattern with other option types. Fixes #818