OPENUCB-348: Merged changes from openberkeley_base to WYSIWYG issues.