Removed dist/Ubuntu directory and merged contents on base. Synced changes with 10.0.10 packaging.