Fixes PMD issues since upgrade to gradle 2.
Merge pull request #276 from msteiger/2.0

Update branch 2.0 to sync with develop
Merge pull request #274 from shartte/2.0

Fixes PMD issues since upgrade to gradle 2.