Previously we had restored the whitespace for *.aj files in6888a6f28to avoid a but in aspectj. We have updated to the latest version of apsectj and restored the changes in commit6888a6f28which included a significant cleanup of whitespace. Issue: SPR-10208