Merge "javelin: add network and secgroup resources"