6956202: Fix a few missed rebranding issues, please contact lines etc.Reviewed-by: jjg, darcy, weijun
4916852: RFE: LTP: BorderLayout Persistence Delegate should use 1.5 APIReviewed-by: peterz, loneid