shixiong/okd @ 9ad145998702ecb8651df73d06dc99bdd2343b57

Andrew Butcher af64e08020 Move storage includes up to main.		%!s(int64=8) %!d(string=hai) anos
..
registry	af64e08020 Move storage includes up to main.	%!s(int64=8) %!d(string=hai) anos
router	291490d224 Rename router and registry node list variables.	%!s(int64=8) %!d(string=hai) anos
main.yml	cb24c6d98b Add knobs for disabling router/registry management.	%!s(int64=8) %!d(string=hai) anos