Merge branch 'b2333-qRestAPI-library-dir' into niftk