Also rename glance_num_retries -> num_retries with deprecation to avoid redundant "glance". Change-Id: I054ed79bfd3c908b3c3841f97b0d381a50280859