Merge pull request #21 from marios/master

Fix Failing tests - required for rpm packaging for deltacloud 1.1.1