Squashed commit of the following:

commit 61b93196340e0d65ba79e54375fa0e0ce2985daf
Merge: 8a0242d c5a2f01
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Sat Jul 26 09:06:53 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature/iplike-search-placeholder

commit 8a0242d9a9381bff9077eeace009843687eb502d
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Jul 21 13:55:47 2014 -0400

    Change IPLIKE search boxes to have empty value and "*.*.*.*" in placeholder
[bamboo] Automated branch merge (from 1.12:caa3decb7f6ea3e62b9ecb44ebe6bf77019a794b)