Merge "Add security advisory information" into stable/boron