bug #18632, bug #16455 - respond to code review
bug #18632, bug #16455 - respond to code review

git-svn-id: 028fe1e6533e6093dd2df965aaa85ff58b59f7db@14213 ea1a15ef-c238-0410-93cb-fa28e9f07733

dpocock/openrpt,xtuple/openrpt,paladinlogic/openrpt,davidbeauchamp/openrpt,xtuple/openrpt,gilmoskowitz/openrpt,dpocock/openrpt,davidbeauchamp/openrpt,dpocock/openrpt,paladinlogic/openrpt,paladinlogic/openrpt,davidbeauchamp/openrpt,gilmoskowitz/openrpt,gilmoskowitz/openrpt,xtuple/openrpt,gilmoskowitz/openrpt