SWITCHYARD-340 Additional cleanup for checkstyle and license headers