Drupal 8 WSCCI patches

Who did this: 

Committed some patches to help with the D8 WSCCI initiative.