NGRINDER-694 - Make unit test work again
[NGRINDER-694] Make unit test work again
[NGRINDER-694] Make unit test work again
[NGRINDER-694] Make unit test work again
[NGRINDER-694] Make unit test work again
[NGRINDER-690] Enhance architecture to provide full REST APIs - Fix bug.
[NGRINDER-694] Make unit test work again
Merge remote-tracking branch 'remotes/origin/master' into compact_page_with_macro