Merge branch 'release/roxy/master' of https://github.com/oguzy/barclamp-glance into release/roxy/master