merge JBIDE-17560 changes first, then JBIDE-14971 bump up to PMD 4.0.3.v20140427-0831 >> master