Add wasMerged in ComponentAccumulator

This MR contains few improvements:

1. adds wasMerged functionality - we need to use temporary CAs in HLT to do proper merging of hypo tools 1.5) improves one deduplication failure message
2. adds option to enable verbose merging of properites
3. cleanes trailing whitespaces Tagging: @wlampl @kjamrog

This merge request affects 1 package:

• Control/AthenaConfiguration

Adding @ssnyder ,@rbianchi as watchers

added Core master review-pending-level-1 labels

changed title from Add wasWergd in ComponentAccumulator to Add wasMergd in ComponentAccumulator

changed the description

changed title from Add wasMergd in ComponentAccumulator to Add wasMerged in ComponentAccumulator

Could you please update the copyright statement in the files affected in this MR?

Thanks, Johannes (L1)

added review-user-action-required label and removed review-pending-level-1 label

Sure, Maybe there will be some comments from Walter or anyone else so I can fix that in one MR (one CI cycle). Cheers, Tomasz

added 18 commits

• 49936253...9cdaf5cb - 16 commits from branch atlas:master
• fba5ee27 - 2019 copyright
• 3dd699b4 - fixed conflicts

Compare with previous version

CI Result SUCCESS

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20753-2019-01-30-18-10
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33008]

This merge request affects 1 package:

• Control/AthenaConfiguration

Adding @ssnyder ,@rbianchi as watchers

added review-pending-level-1 label and removed review-user-action-required label

CI Result SUCCESS

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20753-2019-01-31-01-00
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33041]

Tagging​ @smh as I have used wasMerged of CA to simplify self-test that Stewart recently added.

added Squash commits label

added 1 commit

• 277d5343 - fixed review comments

Compare with previous version

This merge request affects 1 package:

• Control/AthenaConfiguration

Adding @ssnyder ,@rbianchi as watchers

CI Result SUCCESS

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20753-2019-01-31-20-22
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33091]

resolved all discussions