deb http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe non-free
deb-src http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe non-free

deb http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe thirdparty
deb-src http://apt.wikimedia.org/wikimedia <%= scope['::lsbdistcodename'] %>-wikimedia main universe thirdparty

Replace non-free with thirdparty to wikimedia apt
Replace non-free with thirdparty to wikimedia apt

Without this you can't install elasticsearch and the cirrus role is very sad.
This also makes vagrant match how it is configured in production.

Change-Id: I7be7e86880d2c8fbc91bb8c18726d95eaa692f72
