Clean s3 & swift mpu 1.6.x 

corresponds to issue #1504