made the machine data and ads demo scalable

This transaction made the machine and ads demo scalable. 
Please merge it in 0.8.6-migration branch of master