manual merge
https://github.com/Jasig/ContactsPortlet/pull/7

to resolve conflicts