Icehouse branch version updates

* also cleanup unused database dependencies

Change-Id: I8874699feb02c55aad2c7d90bfe99406abd73f52