FLUID-5205: fixed up value rebasing

Fixed an issue with the value rebasing where it wasn't using the rebased valuebinding to do it's lookup. Also attempting to guard against values source from an IoC Reference.