Revert "Merge branch 'master' of https://github.com/Axway/Grapes"
Revert "Merge branch 'master' of https://github.com/Axway/Grapes"

This reverts commit ff9e512d098e962c936505049b56138036f6a1e9, reversing
changes made to dd2577ecdea1dd104adf3e11a31d3bd873f40b81.

mgaunin-axway/Grapes,drautureau/Grapes,jfry-axway/Grapes,drautureau/Grapes,gdelafosse/Grapes,gdelafosse/Grapes,Axway/Grapes,jfry-axway/Grapes,mgaunin-axway/Grapes,Axway/Grapes,gdelafosse/Grapes,Axway/Grapes,gdelafosse/Grapes,jfry-axway/Grapes,mgaunin-axway/Grapes,drautureau/Grapes,drautureau/Grapes,Axway/Grapes,jfry-axway/Grapes,mgaunin-axway/Grapes