SOS-1583 Fix compile error
SOS-1583 Fix language key
LPS-48313 Abstract out direct deploy logic to a smaller macrodefs that can be called independently. No logic changes.
LPS-48313 If you're an OSGi module and you have a portlet.xml, then we need to massage your web.xml
SOS-2199 class opens-new-window-accessible is not styled in SO theme
SOS-2199 font-awesome icons do not work in ie7. Use old icon.
SOS-2137 Add subtitles to make it more obvious these are 2 separate settings
LPS-48313 Make it work whether I type "ant jar" or "ant war"
LPS-48332 Markdown importer should use Knowledge Base attachments and not Documents and Media
LPS-48332 add a : before an exception message
LPS-48332 Notice that KBArticleImporterUtil uses "name" and "fileName" and KBArticleMarkdownConverter uses "imageName" all to mean the same thing. So I renamed it to just "imageFileName".
LPS-48332 Remove exceptions that are not thrown
LPS-48332 Fix random merge related issues (auto SF)