Merge branch 'develop' into update/JAL-3949_abstracted_logging_for_jalviewjs_and_sanity