This was already dealt with for Keystone in OSP 5.0 in bug #1059963. *** This bug has been marked as a duplicate of bug 1059963 ***