Cherry-pick MR !159 to master branch

Fix StrippingCache for 2018-patches

See merge request !159 (merged)

(cherry picked from commit 9a54f9bc)

55e0f88a Fix StrippingCache by switching it to build S29r2; update stripping test to run S29r2.