Merge branch 'master' into 'master'

.gitignore

SOL002/VNFIndicator-API/IndividualVNFindicator.robot

SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot

...2/VNFIndicator-API/environment/individualVnfIndicator.txt

...NFIndicator-API/environment/vnfIndicatorinVnfInstance.txt

SOL005/NSDManagement-API/IndividualNSDescriptor.robot

SOL005/NSDManagement-API/IndividualPnfDescriptor.robot

SOL005/NSDManagement-API/IndividualSubscription.robot

SOL005/NSDManagement-API/NSDContent.robot

SOL005/NSDManagement-API/NSDManagementNotification.robot

SOL005/NSDManagement-API/NSDescriptors.robot

SOL005/NSDManagement-API/PNFDContent.robot

SOL005/NSDManagement-API/PNFDescriptors.robot

SOL005/NSDManagement-API/Subscriptions.robot

SOL005/NSDManagement-API/environment/generic.txt

SOL005/NSDManagement-API/environment/variables.txt

SOL005/NSFaultManagement-API/Alarms.robot

SOL005/NSFaultManagement-API/IndividualAlarm.robot

SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot

SOL005/NSFaultManagement-API/environment/variables.txt