KRDOC-381: fixing build problem with merge
KRDOC-381: fixing build problem with merge

kuali/kc-rice,cniesen/rice,ewestfal/rice-svn2git-test,shahess/rice,smith750/rice,ewestfal/rice,UniversityOfHawaiiORS/rice,bsmith83/rice-1,sonamuthu/rice-1,jwillia/kc-rice1,smith750/rice,kuali/kc-rice,gathreya/rice-kc,ewestfal/rice-svn2git-test,ewestfal/rice-svn2git-test,kuali/kc-rice,UniversityOfHawaiiORS/rice,bhutchinson/rice,bsmith83/rice-1,ewestfal/rice-svn2git-test,UniversityOfHawaiiORS/rice,gathreya/rice-kc,kuali/kc-rice,jwillia/kc-rice1,kuali/kc-rice,rojlarge/rice-kc,sonamuthu/rice-1,gathreya/rice-kc,shahess/rice,gathreya/rice-kc,shahess/rice,geothomasp/kualico-rice-kc,rojlarge/rice-kc,smith750/rice,bsmith83/rice-1,jwillia/kc-rice1,cniesen/rice,cniesen/rice,rojlarge/rice-kc,cniesen/rice,smith750/rice,geothomasp/kualico-rice-kc,shahess/rice,geothomasp/kualico-rice-kc,bhutchinson/rice,rojlarge/rice-kc,ewestfal/rice,sonamuthu/rice-1,gathreya/rice-kc,ewestfal/rice,bhutchinson/rice,rojlarge/rice-kc,ewestfal/rice,jwillia/kc-rice1,smith750/rice,geothomasp/kualico-rice-kc,bhutchinson/rice,jwillia/kc-rice1,UniversityOfHawaiiORS/rice,bhutchinson/rice,cniesen/rice,ewestfal/rice,geothomasp/kualico-rice-kc,shahess/rice,bsmith83/rice-1,UniversityOfHawaiiORS/rice,sonamuthu/rice-1