Merge "Move 'test_admin_deactivate_reactivate_image' test under non-admin directory"