bug 9618: fixed a upgrade, resouce name is changed to XenServer56FP1Resource
bug 9618: fixed a upgrade, resouce name is changed to XenServer56FP1Resource

status 9618: resolved fixed

Conflicts:

	setup/db/db/schema-222to224.sql

resmo/cloudstack,wido/cloudstack,mufaddalq/cloudstack-datera-driver,mufaddalq/cloudstack-datera-driver,mufaddalq/cloudstack-datera-driver,wido/cloudstack,jcshen007/cloudstack,argv0/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,argv0/cloudstack,argv0/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,wido/cloudstack,jcshen007/cloudstack,argv0/cloudstack,DaanHoogland/cloudstack,GabrielBrascher/cloudstack,resmo/cloudstack,cinderella/incubator-cloudstack,resmo/cloudstack,jcshen007/cloudstack,GabrielBrascher/cloudstack,mufaddalq/cloudstack-datera-driver,GabrielBrascher/cloudstack,wido/cloudstack,resmo/cloudstack,wido/cloudstack,cinderella/incubator-cloudstack,cinderella/incubator-cloudstack,DaanHoogland/cloudstack,jcshen007/cloudstack,cinderella/incubator-cloudstack,resmo/cloudstack,GabrielBrascher/cloudstack,argv0/cloudstack,wido/cloudstack,argv0/cloudstack,resmo/cloudstack,resmo/cloudstack,mufaddalq/cloudstack-datera-driver,mufaddalq/cloudstack-datera-driver,cinderella/incubator-cloudstack,wido/cloudstack,jcshen007/cloudstack,DaanHoogland/cloudstack