Preventing false positives for oo-admin-chk and bug fixes

 - Fix for bug 954800
 - Fix for bug 955187
 - Fix for bug 955359