Merge pull request #999 from mdamour1976/master

BISERVER-10406 Change the BI Server assemblies (CE and EE) to include both versions of the data access plug-in
BISERVER-10341 Fix the catalog comparison and add overwrite flag
Merge pull request #1008 from pentaho-tband/BI-10341

BISERVER-10341 Fix the catalog comparison (return code 7) if name is same and add overwrite flag
[BISERVER-10324] Changes to support providing ABS actions from plugins.
Merge pull request #1010 from pentaho-nbaker/master

[BISERVER-10324] Changes to support providing ABS actions from plugins.
Fixing code style
BISERVER-10473 - Added fix for adding custom scripts for themes
Merge pull request #1011 from webdetails/BISERVER-10473

BISERVER-10473 - Added fix for adding custom scripts for themes