Rename TODO counters to SKIPPED
Bump CDH to 5.1.3
Resolve issue with resolving conf
Replace deprecated constants with new constants