kubernetes cherry-pick 2074 and 2140
UPSTREAM: Support PUT returning 201 on Create, kick travis