Merge pull request #1270 from timlinux/master

Fix jenkins build errors due to version bump
Merge pull request #1271 from AIFDR/master

Merge master to develop with jenkins fix from tim
Fix travis due to version bump.
Fix pylint violation. This IF needs some love in the future.
Fix waffle badge URL for In Progress column.
Merge pull request #1272 from akbargumbira/develop

Some fixes to wrap up the release
Merge pull request #1274 from AIFDR/develop

Merge develop to master
Fix for failing tests on master with ub 14.04