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