Revert "Deactivate (and dequeue) proposal when deleting it"

This reverts commit a69f7417519febc110b84fac088d3a1cf05c7525.

Conflicts:

	crowbar_framework/app/models/service_object.rb
Merge pull request #555 from VictorLowther/pull-req-release-pebbles-master-49ce6f80de50886f5a801a915f6b662bceb939ee

Unbreak Pebbles smoketest and unviolate the API. [1/1]