CFY-747: changes following CFY-818
flake8
Merge remote-tracking branch 'gigaspaces/develop' into feature/CFY-747-prefix
Merge pull request #23 from Fewbytes/feature/CFY-747-prefix

Feature/cfy 747 prefix