TRUNK-4496 Moved sql query from service to Dao to remove the sql level access privelege required for saving an order

Follow up - TRUNK-4496
TRUNK-4518 - Calculate autoexpire dates for revise action as well

Add integration test to confirm autoExpireDate set on revised order

Reformarting and cleaning imports