[CLC-506] Hopefully last bit of tinkering with the bamboo build job
Merge pull request #499 from yuhunglin/CLC-506-e

[CLC-506] Hopefully last bit of tinkering with the bamboo build job