TBD-1300: Check service fail when I selct Pivotal 2.0 no kerberos
Merge remote-tracking branch 'origin/maintenance/5.6'