Fixed bootstrap code issue where DeviceDBRD could either only start embedded in portal or standalone but not both
Merge remote-tracking branch 'origin/develop' into develop