Changes to incorporate remaining Rui's code
Merge branch 'rankqa_multisource_search' of github.com:oaqa/baseqa into rankqa_multisource_search