Merge "Remove nova_cert option"