Maven  3.2/3.1 build fix

Fixes issues with building the stack with Maven versions greater than 3.0.5