Merge remote-tracking branch 'chris-gist/master' into dev_5_0
5.0.4: bump pom for ice33/34 support
Bump to pom 5.0.5 for release of 5.0.2 build26