Adding a2 trunk patch and adding some modifications to make A2 work properly in content review impl