FALCON-268 Checkstyle/Findbugs issues on FalconCLI. Contributed by Jean-Baptiste Onofré