fixed import errors from spring integration upgrade