Merge "Remove sonar from appc/deployment"