Merge branch 'master' into thgeneric

Conflicts:
	sfa/methods/CreateSliver.py

diff --cc setup.py
Simple merge

diff --cc sfa/methods/CreateSliver.py
index d5a507e,bb0051a..dd76d9b
--- 1/sfa/methods/CreateSliver.py
--- 2/sfa/methods/CreateSliver.py
+++ b/sfa/methods/CreateSliver.py
@@@ -49,5 -52,9 +50,9 @@@ class CreateSliver(Method)
              chain_name = 'FORWARD-INCOMING'
          self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name)
          rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
- 
-         return self.api.manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
+         slivers = RSpec(rspec).version.get_nodes_with_slivers()
+         if slivers:
 -            result = manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
++            result = self.api.manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)
+         else:
+             result = rspec     
+         return result

diff --cc sfa/plc/aggregate.py
Simple merge