fixed integration tests and added new integration test ResourcePackage_RenameMainPackagesFolder_VerifyTemplatesNotBasedOnLayouts
fixed merge conflicts