Merge pull request #22 in SHRINE/shrine from feature/SHRINE-2174-add-nodeid-to-runqueryrequest to develop
- commit '9abf632844f2c4d70ee79dd47e7024df56769412': Clean up some neglected code for SHRINE-2120 Clean up some neglected code for SHRINE-2120 Rename to save some confusion for SHRINE-2120 Got the name of the QEP node to ride in on the RunQueryRequest for SHRINE-2174. Put NodeId into the QEP and into every RunQueryRequest it sends for SHRINE-2174