wip, databroken options and junit options in makefile
Merge changes from stash, databroker options etc
reinstate executable bit on shell scripts
Merge wip to continue DB progress with options processing
Fix trace such that the ENABLE_TRACE macro is properly accessed throughout the code where trace is used
More work on databroker processing options
fix enabling JUnit output from unit tests in the makefile by setting TEST_JUNIT env variable