Patching changes from jujucharm-n1k git