Issue #2529840 by Kristina Katalinic, Haza, markcarver, pivica, gokulnk, drpl: Fix starterkits for 8.x