Merge "Various fixes to CompOS signature handling."