build hotplugmonitor subdirs in order
Merge remote-tracking branch 'origin/build-fix' into prod