Merge "Switch from using xtend to java in md-sal adapters"