Added shindig-extras
Merge branch 'NXP-10805' into shindig-2.5