fix default config option types

Change-Id: I4bea0b5e12d229b0d9188e10c70996a5606aa970
Fixes: bug #1167318
(cherry picked from commit 56a49adc13cdbc5e2e6a4787cd9c7eb7a72cceb5)
Use the local configuration in the nfs drivers

Fixes bug 1158681

Change-Id: If797a5d3241d6129a8fefea1222b723f03f86452
(cherry picked from commit d15830883eba4b8fb64e0e4760a217ff832f288f)
Merge "Use the local configuration in the nfs drivers" into stable/grizzly
Merge "fix default config option types" into stable/grizzly