Merge "Cleanup nova cell configuration before config it"