Merge "Changes after adaptor integration-api folder move" into devel/master