merge cc/ccdb with ccng/ccdb_ng
Merge branch 'cc-vs-ccng' of https://github.com/duglin/uaa into duglin-cc-vs-ccng

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>