Merge "fix onos charms for xenial."