Fix for PEP8 compliance (OMS-345)
Attempt to hack AllocateAction not to initiate a transaction, when another is active (OMS-345)
Minor tweaks (OMS-345)
Merge branch 'oms-345'