LPS-48099 fix JSP compilation error
LPS-47730 Adapt Knowledge Base to Bootstrap 3
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