Upgrade to trusty-icehouse