Merge branch 'development' into d2d
Fixed liferay version issues
Fixed typo in log message
Merge branch 'd2d' into development
Replaced static name with getClass().getSimpleName() when possible and