This reverts commit d1b847dc.

Conflicts:
	xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityConfiguration.java

(cherry picked from commit c1e8e744)

This reverts commit 6f8509e0.

Conflicts:
	xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityConfiguration.java

(cherry picked from commit 16bd91dc)

* no idea what is the issue but going back to assembly plugin 2.4.1 "fix" it

(cherry picked from commit 1295125d)

(cherry picked from commit cbf1d7de)

XCOMMONS-673: DefaultVelocityEngine is doing a lot of locking

* Fix the AttributeFilter for image elements.

XCOMMONS-671: Support beans that are defined in nested private classes but have public property read/write methods or fields
- Also handling fields.

XCOMMONS-671: Support beans that are defined in nested private classes but have public property read/write methods

* various bulletproofing

* disabled checkstyle since it's not needed here