Merge branch 'android_support_2.5'

Conflicts:
	initial-promises/node-server/common/1.0/site.cf
	initial-promises/node-server/failsafe.cf
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
	initial-promises/node-server/promises.cf
	techniques/fileConfiguration/fileManagement/1.0/manageFilesAndFolders.st
	techniques/fileConfiguration/fileManagement/1.1/manageFilesAndFolders.st
	techniques/fileDistribution/checkGenericFileContent/1.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/2.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/2.1/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.0/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.1/checkGenericFileContent.st
	techniques/fileDistribution/checkGenericFileContent/3.2/checkGenericFileContent.st
	techniques/fileDistribution/copyGitFile/1.1/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.2/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.3/copyFileFromSharedFolder.st
	techniques/fileDistribution/downloadFile/1.0/downloadFile.st
	techniques/jobScheduling/jobScheduler/1.0/job_scheduler.st
	techniques/system/common/1.0/failsafe.st
	techniques/system/common/1.0/promises.st
	techniques/system/common/1.0/site.st
	techniques/system/inventory/1.0/fusionAgent.st