Merge remote-tracking branch 'upstream/master'

Control/CalypsoConfiguration/python/GeoModelConfigFlags.py

Control/CalypsoExample/GeoModelTest/CMakeLists.txt

...l/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py

...l/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py

.../CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py

...ataAccessExample/python/TrackerDataAccessExampleConfig.py

...ataAccessExample/python/TriggerDataAccessExampleConfig.py

...taAccessExample/python/WaveformDataAccessExampleConfig.py

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser01.py

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser02.py

...e/WriteAlignment/python/WriteAlignmentConfig_FaserTB00.py

.../CalypsoExample/WriteAlignment/scripts/CopyAlignFolder.sh

...l/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.cxx

...rol/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.h

...onnectionManagement/FaserAuthentication/data/dblookup.xml

...lignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.cxx

...rAlignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.h

.../TrackerConditions/FaserSCT_ConditionsData/CMakeLists.txt

...Conditions/FaserSCT_ConditionsData/data/SCT_Conditions.py

...Descr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py