IDE-1196 work-in-progress
Removed copied sapphire class and fixed NPE on SDK project import