merge changes from docker testing branch, mostly extra PPAs