Merge remote-tracking branch 'chris-gist/master' into dev_5_1
5.1.4: bump pom for ice33/34 support
5.1.5: working config based on 5.0.9