fix resolves in ocl and imperative ocl
Merge branch 'qvto2pivot' of https://github.com/ooti2013/qvto into qvto2pivot