BUG-1275: use singletonLists

There is no need to instantiate wasteful ArrayLists to hold a single
element -- use Collections.singletonList() for that.

Change-Id: I57c2149acdb8b44b245418cf0437e5f7f05a24ef
Signed-off-by: Robert Varga <rovarga@cisco.com>