Build version advanced to 4984-7
Merge pull request #37 from itaifrenkel/master

CLOUDIFY-1811 Fix build break
Merge pull request #38 from itaifrenkel/master

CLOUDIFY-1811 Fix build break
CLOUDIFY-1811 Fix build break