Bug#3276 eForm Generator page not opening

Simplified and tested to provide images in sorted order

Change-Id: Ibf1db44c796d233f38ee5c6c40c31b4ff23084f0
 #3165 Cannot attach labs or documents to consults
GDML parser reverse changes
Merge "Bug#3276 eForm Generator page not opening" into RELEASE_12_1