Merged in issue-63/FIX_BUILDS (pull request #275)
This PR is meant to fix the 6.3-stable build. Branch build: https://ecosystem-bamboo.internal.atlassian.com/browse/AMPS-AMPSB6D3X5-3
(please don't merge it before it is green)
This PR is meant to fix the 6.3-stable build. Branch build: https://ecosystem-bamboo.internal.atlassian.com/browse/AMPS-AMPSB6D3X5-3
(please don't merge it before it is green)