Merge "PAP S3P jmx file changes"