Fix multiple custom field groups on new entity creation

[stanleylhs]

This code fixes introduces new code to handle multiple field groups in the following scenario:

• Create a tag called 'Tag1'
• Create two Contact field groups that are both tagged with Tag1.
• Create at least one custom field in each field group
• Create a new contact and add 'Tag1'

Expected outcome:

• Both field groups are ajax-loaded into the form

Actual outcome:

• Only one of the field groups is ajax-loaded

[steveyken]

Thank you. This makes sense to cover off this edge case. I have also added some ordering to the query to ensure a consistent UI experience.