Converted #31 to an MR and added a test

David Cameronrequested to merge
issue/drupal-3052479:3052479-machine-name-description into 11.x

Closes #3052479

Merge request reports