Issue #1668820 follow-up by tim.plunkett, sun: Documentation fixes and clean-ups to Configurables patch.