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