[CB-4347] Fix merge issues in bb10 platform guide