rebase kubernetes

Spent a few minutes to see if it was easy.  This one came straight in.  Minor tweaks to cli and to json serialization.  Please confirm changes to api/examples/build-config-list.json in particular.