Merge pull request #294 from pedrofvteixeira/CDF-423

[CDF-423] Regression: Pentaho EE 5.0.7 with latest CTools v14.10.15 is b...