Further l() and url() fixes due to https://www.drupal.org/node/2346779