Bootstrap theme - applied latest patches from Jira issue.

https://issues.apache.org/jira/browse/OFBIZ-5840


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/boostrap_theme@1643547 13f79535-47bb-0310-9956-ffa450edef68