Merge pull request #622 from stewart-ibm/gcc6-firenze-mambo

Switch to GCC6 for Firenze and Mambo platforms