Merge "Fix name from interface to os_interface in compute and controller conf for Ocata"