Account for case when BIND_KRB_* is used in openshift-origin-dns-nsupdate.conf.

When the GSS-TSIG is configured for nsupdate, BIND_KRB_KEYTAB and
BIND_KRB_PRINCIPAL are used in
/etc/openshift/plugins.d/openshift-origin-dns-nsupdate.conf
instead of BIND_KEYNAME and BIND_KEYVALUE.

Addressing
FAIL: wrong number of values returned from ruby code
keys: 6; values: 4
#####

			puts Rails.application.config.dns[:keyname]
			puts Rails.application.config.dns[:port].to_s
			puts Rails.application.config.dns[:zone]
			puts Rails.application.config.openshift[:domain_suffix]
			puts Rails.application.config.dns[:keyvalue]
			puts Rails.application.config.dns[:server]
#####
53 example.com example.com 10.16.120.18
#####
With BIND_KRB_*, nsupdate -g needs to be used.

Addressing
#####
could not create key from txt: bad base64 encoding
syntax error
FAIL: error testrecord.10.16.120.18ing this_is_a_test record name  to server 53:
	-- is the nameserver running, reachable, and key auth working?
FAIL: txt record testrecord.10.16.120.18 does not resolve on server
could not create key from txt: bad base64 encoding
syntax error
FAIL: error testrecord.10.16.120.18ing  record name  to server 53:
	-- is the nameserver running, reachable, and key auth working?
Bug 969725: Ensure cleanup on cartridge deconfigure
Merge pull request #2732 from adelton/oo-accept-broker-krb

Merged by openshift-bot
Remove rubygem-builder dep from php cartridges

Both v1 and v2 php cartridges had a RPM dependency for rubygem-builder
that is not needed.
Merge pull request #2733 from ironcladlou/bz/969725

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-console] release [1.10.1-2].
Fix bug 969605
Merge pull request #2718 from detiber/phpCartDepClean

Merged by openshift-bot
Make NodeLogger pluggable
Fix bug 969605

Validate control script is executable only if it exists
fix for bz970008
Merge pull request #2737 from ironcladlou/dev/loggin

Merged by openshift-bot
return HTTP Status code 200 from DELETE instead of 204
fix sanity tests
Merge pull request #2735 from pmorie/bugs/969605

Merged by openshift-bot
Merge pull request #2738 from rajatchopra/master

Merged by openshift-bot
Merge pull request #2666 from lnader/rest-api-version-1.5

Merged by openshift-bot
delete downloaded cartridge when component is deleted
Merge pull request #2740 from danmcp/master

Merged by openshift-bot