54738ea382
Bug #1042030 , part 2 Also reworks model queries in order to allow plugins and extensions to augment them as required through hooks. Change-Id: Ice72fc6d3b1c613d596c037818ed66d7e9ed841d