6471cf0 Use Macro for collection_version properly

Authored and Committed by spetros a year ago
    Use Macro for collection_version properly
    
    And fix replacing upstream to downstream collection name