Remove static const definitions as IBM compiler does not allow them
Merge branch 'masterupstream' into boundarycyclic