Take account of the include file moves in MoleQueue

Change-Id: Icf5d68b006815f3432e7ba463f6ec8b690904d9b
Merge topic 'molequeue-update' into master

b5cbf01d Take account of the include file moves in MoleQueue