HypoTools merging logic

Krzysztof Piotr Jamrogrequested to merge
kjamrog/athena:newjo into master

Continuation of work on getting rid of cache usage by implementing new way of HypoTools merging

Tagging @tbold

Edited by Krzysztof Piotr Jamrog

Merge request reports