Merge "Fix sample conf for compatability with devstack."