FALCON-848 ListEntitiesTest tagged and checkstyle bugs fixed. Contributed by Ruslan Ostafiychuk