WCM-97 Fix packaging errors with latest 6.2.x SDK version