Ch 855

Making this PR against CH-845 as that was its starting point.

This adds some limited support for personalizable fields on field collections on other entities. 

The main limitation is that only one level of field collection is supported - nested field collections are not handled here.
This is the one line that changed behaviour from the cut-n-paste chunk above: see CH-899 for background.