Merging experimental into master

No provisioners reference the old master image anymore, so merging in "experimental" and making it master.