Fix publishing of Config Reference and Install Guides

The patch I4a11d74d3e53738d33b8ba9b50119bb1c25a1aec broke
publishing of these guides, revert parts of the change as
stop-gap.

Change-Id: Ie0860ae446e023b9b39a622bf0861910639cfb39