LIMS-1192: Fix capillary names

[ndg63276]

JIRA ticket: LIMS-1192

Summary:

A recent change (#686) improved the names of samples, but also affected the names of automatically created capillaries. This then broke things further down the chain.

Changes:

• Put the crystal name back to how it was for capillaries
• Use the passed in crystal name for the sample name
• Change the crystal name passed in for non-capillary crystals

To test:

• Go to cm37261, then go to Phases, pick one. Click "+ New Simple Sample", fill in the form with a memorable acronym, and use one of the Borosilicate capillaries and submit. Then go to Samples, 2 should have been created. One named acronym-sample, and one ending in _CP for the capillary.
• Repeat above but with a new acronym and using the _CP sample as your capillary. Only one new sample should be created, but if you drill down to the instance, it will be in a sample group with the _CP sample.