Update ceilometer to latest master
Update glance to latest master
Merge pull request #120 from xbezdick/master

glance and ceilometer master