kcirb-17 : clean up and fix a bug
kcirb-17 : clean up and fix a bug

mukadder/kc,jwillia/kc-old1,mukadder/kc,geothomasp/kcmit,kuali/kc,iu-uits-es/kc,kuali/kc,jwillia/kc-old1,jwillia/kc-old1,mukadder/kc,UniversityOfHawaiiORS/kc,jwillia/kc-old1,ColostateResearchServices/kc,geothomasp/kcmit,geothomasp/kcmit,UniversityOfHawaiiORS/kc,iu-uits-es/kc,kuali/kc,UniversityOfHawaiiORS/kc,geothomasp/kcmit,geothomasp/kcmit,ColostateResearchServices/kc,ColostateResearchServices/kc,iu-uits-es/kc