add caption_lines method to RcaImage and use that for the caption output logic in rich text embedded images and in carousel
Merge branch 'master' of github.com:torchbox/verdant-rca