Cache keys to consider OS and machine arch

Tristan Van Berkomrequested to merge
cache-keys-os-arch into master

We are having collisions with weak cache keys on this level, this was a regression from when we added the "arch" project option type.

Merge request reports