[drupal8] Updated to latest upstream and a few other minor changes