[Bug 699849] Request Merge Of Upstream gconfd Fixes