Add user-data for ubuntu
Some more fixes in user-data
Ubuntu