Merge "Add body id to ssl_certificate layout"