Include short description as first line of long text

Closes-Bug: #1268720

Change-Id: Ief73bdb14ec79c0d7b61f9b53022e1baec6a7144
author: diane fleming diane.fleming@rackspace.com
Merge "Include short description as first line of long text"