Couple small changes needed for tests of a new premium feature.
@diosmosis looks good generally. Some tests are failing though see eg https://travis-ci.org/github/matomo-org/matomo/jobs/685178687
ping @diosmosis
working on this one off the clock, may be a bit before I get to it