Created by: rpost
Cleanup as mentioned in #9441
Mentioning Java and JavaSpring committee:
@bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608
@cachescrubber @welshm @MelleD @atextor @manedev79 @javisst @borsch @banlevente